Skip to content

chore(trino): Bump trino ahead of 25.7.0#1095

Merged
NickLarsenNZ merged 9 commits intomainfrom
chore/bump-trino-before-25.7.0
Jun 10, 2025
Merged

chore(trino): Bump trino ahead of 25.7.0#1095
NickLarsenNZ merged 9 commits intomainfrom
chore/bump-trino-before-25.7.0

Conversation

@NickLarsenNZ
Copy link
Member

@NickLarsenNZ NickLarsenNZ commented May 5, 2025 •
edited
Loading

Part of #1082

  • Add: 476 (don't forget the patches)
  • Remove: 455

Definition of Done Checklist

Note

Not all of these items are applicable to all PRs, the author should update this template to only leave the boxes in that are relevant.

Please make sure all these things are done and tick the boxes

  • Changes are OpenShift compatible
  • All added packages (via microdnf or otherwise) have a comment on why they are added
  • Things not downloaded from Red Hat repositories should be mirrored in the Stackable repository and downloaded from there
  • All packages should have (if available) signatures/hashes verified
  • Add an entry to the CHANGELOG.md file
  • Integration tests ran successfully
TIP: Running integration tests with a new product image

The image can be built and uploaded to the kind cluster with the following commands:

bake --product <product> --image-version <stackable-image-version>
kind load docker-image <image-tagged-with-the-major-version> --name=<name-of-your-test-cluster>

See the output of bake to retrieve the image tag for <image-tagged-with-the-major-version>.

@NickLarsenNZ NickLarsenNZ self-assigned this May 5, 2025
@NickLarsenNZ NickLarsenNZ force-pushed the chore/bump-trino-before-25.7.0 branch 2 times, most recently from bddca8c to 91abb66 Compare May 5, 2025 15:56
@NickLarsenNZ NickLarsenNZ marked this pull request as draft May 5, 2025 15:58
This was referenced May 5, 2025
Closed
Merged
@NickLarsenNZ NickLarsenNZ force-pushed the chore/bump-trino-before-25.7.0 branch 2 times, most recently from de747c7 to 825d7cf Compare May 5, 2025 19:05
@NickLarsenNZ NickLarsenNZ force-pushed the chore/bump-trino-before-25.7.0 branch from 825d7cf to f4ac4ee Compare May 5, 2025 19:15
@NickLarsenNZ
Merge remote-tracking branch 'origin/main' into chore/bump-trino-befo…
23b8bb3 
…re-25.7.0
@NickLarsenNZ
chore(trino): Patch 476
a3c45fd
@NickLarsenNZ
fix(trino): Use correct reference to storage-connector
683a028
@NickLarsenNZ
fix(trino): Selectively skip projects by version
893af7a 
Also remove the git hack for patchable and instead skip gitcommitid like we do for druid and rearrange the command into multiple lines with additional skips
@NickLarsenNZ NickLarsenNZ marked this pull request as ready for review June 10, 2025 12:58
@NickLarsenNZ NickLarsenNZ moved this to Development: Waiting for Review in Stackable Engineering Jun 10, 2025
NickLarsenNZ
NickLarsenNZ commented Jun 10, 2025
View reviewed changes
trino/Dockerfile
--batch-mode \
--no-transfer-progress \
package \
`# -Dmaven.test.skip # Unable to skip test compilation without an unused dependency error for software.amazon.awssdk:identity-spi` \
Copy link
Member Author

@NickLarsenNZ NickLarsenNZ Jun 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just pointing out that we cannot skip compilation yet, else we hit this issue:

[ERROR] Unused declared dependencies found:
[ERROR]    software.amazon.awssdk:identity-spi:jar:2.31.57:compile

Slack thread discussing whether to patch out the unused dependency, or just continue compiling tests even though we skip running them.

I'll mark this comment as resolved after approval

@NickLarsenNZ
Copy link
Member Author

NickLarsenNZ commented Jun 10, 2025 •
edited
Loading

Build succeeds (also tested 470):

 => [trino-476] exporting to image                                                                                                                                                                                                                                                                               3.0s
 => => exporting layers                                                                                                                                                                                                                                                                                          2.9s
 => => writing image sha256:7833aa1d1025eb5271c6fccea7e6fdd9f033cd14dd0dcc45ffb781c8a9eadec4                                                                                                                                                                                                                     0.0s
 => => naming to oci.stackable.tech/sdp/trino:476-stackable0.0.0-dev

@NickLarsenNZ NickLarsenNZ moved this from Development: Waiting for Review to Development: In Progress in Stackable Engineering Jun 10, 2025
@NickLarsenNZ NickLarsenNZ moved this from Development: In Progress to Development: Waiting for Review in Stackable Engineering Jun 10, 2025
@razvan razvan self-requested a review June 10, 2025 14:06
@razvan razvan moved this from Development: Waiting for Review to Development: In Review in Stackable Engineering Jun 10, 2025
razvan
razvan approved these changes Jun 10, 2025
View reviewed changes
Copy link
Member

@razvan razvan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@NickLarsenNZ NickLarsenNZ enabled auto-merge June 10, 2025 14:52
@NickLarsenNZ NickLarsenNZ added this pull request to the merge queue Jun 10, 2025
@NickLarsenNZ NickLarsenNZ moved this from Development: In Review to Development: Done in Stackable Engineering Jun 10, 2025
Merged via the queue into main with commit 30ace83 Jun 10, 2025
3 checks passed
@NickLarsenNZ NickLarsenNZ deleted the chore/bump-trino-before-25.7.0 branch June 10, 2025 14:53
@nightkr
Copy link
Contributor

nightkr commented Jun 10, 2025

Probably want to patch out the tech debt introduced in 471.

@NickLarsenNZ NickLarsenNZ mentioned this pull request Jun 10, 2025
Closed
6 tasks
NickLarsenNZ added a commit that referenced this pull request Jun 10, 2025
@NickLarsenNZ
fix(trino): Restore CycloneDX patch for 451
4a18b39 
It went missing during a merge in #1095
@NickLarsenNZ NickLarsenNZ mentioned this pull request Jun 10, 2025
Merged
github-merge-queue bot pushed a commit that referenced this pull request Jun 10, 2025
@NickLarsenNZ
fix(trino): Restore CycloneDX patch for 451 (#1155)
ba8fbf3 
It went missing during a merge in #1095
@lfrancke lfrancke moved this from Development: Done to Done in Stackable Engineering Jun 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@razvan razvan razvan approved these changes

Assignees

@NickLarsenNZ NickLarsenNZ

Labels

release/25.7.0

Projects

Stackable Engineering
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@NickLarsenNZ @nightkr @razvan @lfrancke